[IA64] Fix IA64 build.

This patch gets ia64 building again on xen-unstable.hg due to the
addition of the uint64_t type in public/arch-ia64.h.  I also cleaned
up directly including this file versus public/xen.h as ia64 seems to be
the only arch using it directly.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/vmx/mmio.c b/xen/arch/ia64/vmx/mmio.c
index c1de4a786ff994175243cb830689ae6bd12fe433..f67764320db50adcd11f03ba7137f960d4e75b9e 100644 (file)
--- a/xen/arch/ia64/vmx/mmio.c
+++ b/xen/arch/ia64/vmx/mmio.c
@@ -33,7 +33,7 @@
 #include <asm/mm.h>
 #include <asm/vmx.h>
 #include <public/event_channel.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <linux/event.h>
 #include <xen/domain.h>
 /*

diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c
index 2d255b7aacd81e60e7aaa70bc6b50f786568728a..0bc909f1270d8d28077b04bbadbe9a8324152671 100644 (file)
--- a/xen/arch/ia64/vmx/vlsapic.c
+++ b/xen/arch/ia64/vmx/vlsapic.c
@@ -21,7 +21,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>

diff --git a/xen/arch/ia64/vmx/vmx_init.c b/xen/arch/ia64/vmx/vmx_init.c
index feaf0ab4416f1918b7ccf78c51a395918f381412..cb0d24045f3d4e11a5c9826346ccea48c71ae88e 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_init.c
+++ b/xen/arch/ia64/vmx/vmx_init.c
@@ -41,15 +41,14 @@
 #include <asm/vmx_vcpu.h>
 #include <xen/lib.h>
 #include <asm/vmmu.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <public/hvm/ioreq.h>
+#include <public/event_channel.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/processor.h>
 #include <asm/vmx.h>
 #include <xen/mm.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
-#include <public/event_channel.h>
 #include <xen/event.h>
 #include <asm/vlsapic.h>
 

diff --git a/xen/arch/ia64/vmx/vmx_vcpu.c b/xen/arch/ia64/vmx/vmx_vcpu.c
index 313c16cbd6236820bf4f0afa873b1e76411ea95b..e6824d3ec9806b2c6686a6f8dfd855113bb8e756 100644 (file)
--- a/xen/arch/ia64/vmx/vmx_vcpu.c
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c
@@ -24,7 +24,7 @@
  */
 
 #include <xen/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/regionreg.h>

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 86ff7d85f54ec90cbab06edfa22a82130a0f8f38..55ce4b7868ba741f7db57409475ced5c8ffad2cd 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -35,14 +35,13 @@
 #include <asm/pgalloc.h>
 #include <asm/offsets.h>  /* for IA64_THREAD_INFO_SIZE */
 #include <asm/vcpu.h>   /* for function declarations */
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <xen/domain.h>
 #include <asm/vmx.h>
 #include <asm/vmx_vcpu.h>
 #include <asm/vmx_vpd.h>
 #include <asm/vmx_phy_mode.h>
 #include <asm/vhpt.h>
-#include <public/arch-ia64.h>
 #include <asm/tlbflush.h>
 #include <asm/regionreg.h>
 #include <asm/dom_fw.h>

diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S
index 67efc3fc966c87954c7a092ee0f36eed94fb865d..1585efd82cf56758e8a407a8f4beed592462b1b1 100644 (file)
--- a/xen/arch/ia64/xen/hyperprivop.S
+++ b/xen/arch/ia64/xen/hyperprivop.S
@@ -14,7 +14,7 @@
 #include <asm/system.h>
 #include <asm/debugger.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 
 #define        _PAGE_PPN_MASK  0x0003fffffffff000 //asm/pgtable.h doesn't do assembly

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index 18fd1989b8d062ee36989d13e9691075c7445a7d..18dfec4e1fc5323271480827ad95fc967cfd1d60 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -7,7 +7,7 @@
  */
 
 #include <linux/sched.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/ia64_int.h>
 #include <asm/vcpu.h>
 #include <asm/regionreg.h>

diff --git a/xen/arch/ia64/xen/xenasm.S b/xen/arch/ia64/xen/xenasm.S
index 74775321522188f26a974bc69e18d70a34b3bec8..f60b5804c415624c30c950165449db4c122de151 100644 (file)
--- a/xen/arch/ia64/xen/xenasm.S
+++ b/xen/arch/ia64/xen/xenasm.S
@@ -11,7 +11,7 @@
 #include <asm/pgtable.h>
 #include <asm/vhpt.h>
 #include <asm/asm-xsi-offsets.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
        
 // Change rr7 to the passed value while ensuring
 // Xen is mapped into the new region.

diff --git a/xen/include/asm-ia64/domain.h b/xen/include/asm-ia64/domain.h
index 9c565cff9f24d7272765298dd587afcfae5a0b1f..c15f9c1915ee26ce7c0f9218cc88bd0a6cfe3d10 100644 (file)
--- a/xen/include/asm-ia64/domain.h
+++ b/xen/include/asm-ia64/domain.h
@@ -6,7 +6,7 @@
 #include <asm/vmx_vpd.h>
 #include <asm/vmmu.h>
 #include <asm/regionreg.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vmx_platform.h>
 #include <xen/list.h>
 #include <xen/cpumask.h>

diff --git a/xen/include/asm-ia64/event.h b/xen/include/asm-ia64/event.h
index 19113a56e0cd8bc409519c52158db6d5bd1a1a88..ef4c33f2be427be3e734bc3a4f7f34648f146b08 100644 (file)
--- a/xen/include/asm-ia64/event.h
+++ b/xen/include/asm-ia64/event.h
@@ -9,7 +9,7 @@
 #ifndef __ASM_EVENT_H__
 #define __ASM_EVENT_H__
 
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 #include <asm/vcpu.h>
 
 static inline void vcpu_kick(struct vcpu *v)

diff --git a/xen/include/asm-ia64/linux-xen/asm/ptrace.h b/xen/include/asm-ia64/linux-xen/asm/ptrace.h
index c8372158b078a03feb80a6a387847ae8a345a3e4..574c69d163a157bc858740c5cbc983fc8cf84877 100644 (file)
--- a/xen/include/asm-ia64/linux-xen/asm/ptrace.h
+++ b/xen/include/asm-ia64/linux-xen/asm/ptrace.h
@@ -96,7 +96,8 @@
  *
  */
 #ifdef XEN
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 #define pt_regs cpu_user_regs
 
 /*  User regs at placed at the end of the vcpu area.

diff --git a/xen/include/asm-ia64/privop_stat.h b/xen/include/asm-ia64/privop_stat.h
index b48a39ed3ced2d085d85278d4c7c1a2571d4328c..c3cd173fc50365e374533f16f548e770c06c7d3d 100644 (file)
--- a/xen/include/asm-ia64/privop_stat.h
+++ b/xen/include/asm-ia64/privop_stat.h
@@ -1,6 +1,7 @@
 #ifndef _XEN_UA64_PRIVOP_STAT_H
 #define _XEN_UA64_PRIVOP_STAT_H
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 
 extern int dump_privop_counts_to_user(char *, int);
 extern int zero_privop_counts_to_user(char *, int);

diff --git a/xen/include/asm-ia64/vcpu.h b/xen/include/asm-ia64/vcpu.h
index 87076da9fa98f0ffa6c5def56ab9eb2f271a0616..87b3801b2f860721c69d42e51da1dd98fe54e88c 100644 (file)
--- a/xen/include/asm-ia64/vcpu.h
+++ b/xen/include/asm-ia64/vcpu.h
@@ -7,7 +7,8 @@
 #include <asm/fpu.h>
 #include <asm/tlb.h>
 #include <asm/ia64_int.h>
-#include <public/arch-ia64.h>
+#include <xen/types.h>
+#include <public/xen.h>
 typedef        unsigned long UINT64;
 typedef        unsigned int UINT;
 typedef        int BOOLEAN;

diff --git a/xen/include/asm-ia64/vmx_platform.h b/xen/include/asm-ia64/vmx_platform.h
index f73e1b0cfbd16df8bff87bfe44675e66a69a125e..33c4003cf3df1395dedca38fc02776a21cb8afa2 100644 (file)
--- a/xen/include/asm-ia64/vmx_platform.h
+++ b/xen/include/asm-ia64/vmx_platform.h
@@ -21,7 +21,6 @@
 
 #include <public/xen.h>
 #include <public/hvm/params.h>
-#include <public/arch-ia64.h>
 #include <asm/hvm/vioapic.h>
 struct mmio_list;
 typedef struct virtual_platform_def {

diff --git a/xen/include/asm-ia64/vmx_vpd.h b/xen/include/asm-ia64/vmx_vpd.h
index 77d79fb7044293cc20c607f5c1acea4ed7382373..673257c0fd6e2faaf8cd8c88b09e2e3ac3cf5455 100644 (file)
--- a/xen/include/asm-ia64/vmx_vpd.h
+++ b/xen/include/asm-ia64/vmx_vpd.h
@@ -26,7 +26,7 @@
 
 #include <asm/vtm.h>
 #include <asm/vmx_platform.h>
-#include <public/arch-ia64.h>
+#include <public/xen.h>
 
 #define VPD_SHIFT      17      /* 128K requirement */
 #define VPD_SIZE       (1 << VPD_SHIFT)